Original changelog:
[NET]: Fix reversed error test in netif_tx_trylock
A non-zero return value indicates success from spin_trylock,
not error.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
--- /dev/null
+diff -urp a/include/linux/netdevice.h b/include/linux/netdevice.h
+--- a/include/linux/netdevice.h 2006-07-25 15:16:39.314333975 +0100
++++ b/include/linux/netdevice.h 2006-07-25 15:19:37.298320799 +0100
+@@ -930,10 +930,10 @@ static inline void netif_tx_lock_bh(stru
+
+ static inline int netif_tx_trylock(struct net_device *dev)
+ {
+- int err = spin_trylock(&dev->_xmit_lock);
+- if (!err)
++ int ok = spin_trylock(&dev->_xmit_lock);
++ if (likely(ok))
+ dev->xmit_lock_owner = smp_processor_id();
+- return err;
++ return ok;
+ }
+
+ static inline void netif_tx_unlock(struct net_device *dev)